bitkeeper revision 1.1159.69.17 (413b5ab8tE2tTd_Ht7wxKU0Uktv2_w)
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sun, 5 Sep 2004 18:28:08 +0000 (18:28 +0000)
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sun, 5 Sep 2004 18:28:08 +0000 (18:28 +0000)
Fix WBINVD uses.

.rootkeys
linux-2.6.8.1-patches/agpgart.patch
linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/Makefile
linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/pageattr.c [new file with mode: 0644]

index 78e1b4f5ca252d52a71ee76ea6ace0fbece54e8f..2597b013de828e094db96d58a06cbaa2d843f75a 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
 40f562383SKvDStdtrvzr5fyCbW4rw linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/hypervisor.c
 40f56239xcNylAxuGsQHwi1AyMLV8w linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/init.c
 41062ab7CjxC1UBaFhOMWWdhHkIUyg linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c
+413b5ab8LIowAnQrEmaOJSdmqm96jQ linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/pageattr.c
 40f5623906UYHv1rsVUeRc0tFT0dWw linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/pgtable.c
 4107adf12ndy94MidCaivDibJ3pPAg linux-2.6.8.1-xen-sparse/arch/xen/i386/pci/Makefile
 4107adf1WcCgkhsdLTRGX52cOG1vJg linux-2.6.8.1-xen-sparse/arch/xen/i386/pci/direct.c
index f5d2ad9f175e7fdab37267e1c73dfb88da614d93..aba8b200b10c6beaaf28bcc79bbd083af384c95e 100644 (file)
  
        for (i = 0; i < num_entries; i++) {
                agp_bridge->gatt_table[i] =
+--- linux-2.6.8.1/include/asm-i386/agp.h       2004-08-14 11:54:47.000000000 +0100
++++ linux-2.6.8.1-xen0/include/asm-i386/agp.h  2004-09-05 05:57:26.040268956 +0100
+@@ -3,6 +3,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/cacheflush.h>
++#include <asm/system.h>
+ /* 
+  * Functions to keep the agpgart mappings coherent with the MMU.
+@@ -19,6 +20,6 @@
+ /* Could use CLFLUSH here if the cpu supports it. But then it would
+    need to be called for each cacheline of the whole page so it may not be 
+    worth it. Would need a page for it. */
+-#define flush_agp_cache() asm volatile("wbinvd":::"memory")
++#define flush_agp_cache() wbinvd()
+ #endif
index 55063591f02bbd7203a61c7bf27280eede0d55c1..50c97507c22637e9bc70e42e79518b8237d3eca0 100644 (file)
@@ -6,8 +6,8 @@ XENARCH := $(subst ",,$(CONFIG_XENARCH))
 
 CFLAGS += -Iarch/$(XENARCH)/mm
 
-obj-y  := init.o fault.o ioremap.o pgtable.o hypervisor.o
-c-obj-y        := extable.o pageattr.o 
+obj-y  := init.o fault.o ioremap.o pgtable.o hypervisor.o pageattr.o
+c-obj-y        := extable.o
 
 c-obj-$(CONFIG_DISCONTIGMEM)   += discontig.o
 c-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/pageattr.c b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/pageattr.c
new file mode 100644 (file)
index 0000000..5734145
--- /dev/null
@@ -0,0 +1,215 @@
+/* 
+ * Copyright 2002 Andi Kleen, SuSE Labs. 
+ * Thanks to Ben LaHaise for precious feedback.
+ */ 
+
+#include <linux/config.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/highmem.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <asm/uaccess.h>
+#include <asm/processor.h>
+#include <asm/tlbflush.h>
+
+static spinlock_t cpa_lock = SPIN_LOCK_UNLOCKED;
+static struct list_head df_list = LIST_HEAD_INIT(df_list);
+
+
+pte_t *lookup_address(unsigned long address) 
+{ 
+       pgd_t *pgd = pgd_offset_k(address); 
+       pmd_t *pmd;
+       if (pgd_none(*pgd))
+               return NULL;
+       pmd = pmd_offset(pgd, address);                
+       if (pmd_none(*pmd))
+               return NULL;
+       if (pmd_large(*pmd))
+               return (pte_t *)pmd;
+        return pte_offset_kernel(pmd, address);
+} 
+
+static struct page *split_large_page(unsigned long address, pgprot_t prot)
+{ 
+       int i; 
+       unsigned long addr;
+       struct page *base;
+       pte_t *pbase;
+
+       spin_unlock_irq(&cpa_lock);
+       base = alloc_pages(GFP_KERNEL, 0);
+       spin_lock_irq(&cpa_lock);
+       if (!base) 
+               return NULL;
+
+       address = __pa(address);
+       addr = address & LARGE_PAGE_MASK; 
+       pbase = (pte_t *)page_address(base);
+       for (i = 0; i < PTRS_PER_PTE; i++, addr += PAGE_SIZE) {
+               pbase[i] = pfn_pte(addr >> PAGE_SHIFT, 
+                                  addr == address ? prot : PAGE_KERNEL);
+       }
+       return base;
+} 
+
+static void flush_kernel_map(void *dummy) 
+{ 
+       /* Could use CLFLUSH here if the CPU supports it (Hammer,P4) */
+       if (boot_cpu_data.x86_model >= 4) 
+               wbinvd();
+       /* Flush all to work around Errata in early athlons regarding 
+        * large page flushing. 
+        */
+       __flush_tlb_all();      
+}
+
+static void set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) 
+{ 
+       struct page *page;
+       unsigned long flags;
+
+       set_pte_atomic(kpte, pte);      /* change init_mm */
+       if (PTRS_PER_PMD > 1)
+               return;
+
+       spin_lock_irqsave(&pgd_lock, flags);
+       for (page = pgd_list; page; page = (struct page *)page->index) {
+               pgd_t *pgd;
+               pmd_t *pmd;
+               pgd = (pgd_t *)page_address(page) + pgd_index(address);
+               pmd = pmd_offset(pgd, address);
+               set_pte_atomic((pte_t *)pmd, pte);
+       }
+       spin_unlock_irqrestore(&pgd_lock, flags);
+}
+
+/* 
+ * No more special protections in this 2/4MB area - revert to a
+ * large page again. 
+ */
+static inline void revert_page(struct page *kpte_page, unsigned long address)
+{
+       pte_t *linear = (pte_t *) 
+               pmd_offset(pgd_offset(&init_mm, address), address);
+       set_pmd_pte(linear,  address,
+                   pfn_pte((__pa(address) & LARGE_PAGE_MASK) >> PAGE_SHIFT,
+                           PAGE_KERNEL_LARGE));
+}
+
+static int
+__change_page_attr(struct page *page, pgprot_t prot)
+{ 
+       pte_t *kpte; 
+       unsigned long address;
+       struct page *kpte_page;
+
+#ifdef CONFIG_HIGHMEM
+       if (page >= highmem_start_page) 
+               BUG(); 
+#endif
+       address = (unsigned long)page_address(page);
+
+       kpte = lookup_address(address);
+       if (!kpte)
+               return -EINVAL;
+       kpte_page = virt_to_page(((unsigned long)kpte) & PAGE_MASK);
+       if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL)) { 
+               if ((pte_val(*kpte) & _PAGE_PSE) == 0) { 
+                       pte_t old = *kpte;
+                       pte_t standard = mk_pte(page, PAGE_KERNEL); 
+                       set_pte_atomic(kpte, mk_pte(page, prot)); 
+                       if (pte_same(old,standard))
+                               get_page(kpte_page);
+               } else {
+                       struct page *split = split_large_page(address, prot); 
+                       if (!split)
+                               return -ENOMEM;
+                       get_page(kpte_page);
+                       set_pmd_pte(kpte,address,mk_pte(split, PAGE_KERNEL));
+               }       
+       } else if ((pte_val(*kpte) & _PAGE_PSE) == 0) { 
+               set_pte_atomic(kpte, mk_pte(page, PAGE_KERNEL));
+               __put_page(kpte_page);
+       }
+
+       if (cpu_has_pse && (page_count(kpte_page) == 1)) {
+               list_add(&kpte_page->lru, &df_list);
+               revert_page(kpte_page, address);
+       } 
+       return 0;
+} 
+
+static inline void flush_map(void)
+{
+       on_each_cpu(flush_kernel_map, NULL, 1, 1);
+}
+
+/*
+ * Change the page attributes of an page in the linear mapping.
+ *
+ * This should be used when a page is mapped with a different caching policy
+ * than write-back somewhere - some CPUs do not like it when mappings with
+ * different caching policies exist. This changes the page attributes of the
+ * in kernel linear mapping too.
+ * 
+ * The caller needs to ensure that there are no conflicting mappings elsewhere.
+ * This function only deals with the kernel linear map.
+ * 
+ * Caller must call global_flush_tlb() after this.
+ */
+int change_page_attr(struct page *page, int numpages, pgprot_t prot)
+{
+       int err = 0; 
+       int i; 
+       unsigned long flags;
+
+       spin_lock_irqsave(&cpa_lock, flags);
+       for (i = 0; i < numpages; i++, page++) { 
+               err = __change_page_attr(page, prot);
+               if (err) 
+                       break; 
+       }       
+       spin_unlock_irqrestore(&cpa_lock, flags);
+       return err;
+}
+
+void global_flush_tlb(void)
+{ 
+       LIST_HEAD(l);
+       struct list_head* n;
+
+       BUG_ON(irqs_disabled());
+
+       spin_lock_irq(&cpa_lock);
+       list_splice_init(&df_list, &l);
+       spin_unlock_irq(&cpa_lock);
+       flush_map();
+       n = l.next;
+       while (n != &l) {
+               struct page *pg = list_entry(n, struct page, lru);
+               n = n->next;
+               __free_page(pg);
+       }
+} 
+
+#ifdef CONFIG_DEBUG_PAGEALLOC
+void kernel_map_pages(struct page *page, int numpages, int enable)
+{
+       if (PageHighMem(page))
+               return;
+       /* the return value is ignored - the calls cannot fail,
+        * large pages are disabled at boot time.
+        */
+       change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
+       /* we should perform an IPI and flush all tlbs,
+        * but that can deadlock->flush only current cpu.
+        */
+       __flush_tlb_all();
+}
+EXPORT_SYMBOL(kernel_map_pages);
+#endif
+
+EXPORT_SYMBOL(change_page_attr);
+EXPORT_SYMBOL(global_flush_tlb);